From be60805ef6f41ddbd69f1b3b4ac1052d7b05ca3b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 3 Dec 2004 03:42:48 +0000 Subject: [PATCH] Reinstate the previous behavior for clicking Ok after activating a 2004-12-02 Matthias Clasen * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond): Reinstate the previous behavior for clicking Ok after activating a bookmark or path bar button in folder modes. (#160044, Dennis Cranston) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkfilechooserdefault.c | 13 +++++++++---- 5 files changed, 33 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a92d1c9800..26458ec94f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-12-02 Matthias Clasen + + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond): Reinstate the previous behavior for clicking Ok after + activating a bookmark or path bar button in folder + modes. (#160044, Dennis Cranston) + 2004-12-02 Federico Mena Quintero Merged from gtk-2-4: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a92d1c9800..26458ec94f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2004-12-02 Matthias Clasen + + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond): Reinstate the previous behavior for clicking Ok after + activating a bookmark or path bar button in folder + modes. (#160044, Dennis Cranston) + 2004-12-02 Federico Mena Quintero Merged from gtk-2-4: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a92d1c9800..26458ec94f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2004-12-02 Matthias Clasen + + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond): Reinstate the previous behavior for clicking Ok after + activating a bookmark or path bar button in folder + modes. (#160044, Dennis Cranston) + 2004-12-02 Federico Mena Quintero Merged from gtk-2-4: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a92d1c9800..26458ec94f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2004-12-02 Matthias Clasen + + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_should_respond): Reinstate the previous behavior for clicking Ok after + activating a bookmark or path bar button in folder + modes. (#160044, Dennis Cranston) + 2004-12-02 Federico Mena Quintero Merged from gtk-2-4: diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 7fb605e242..489b9d46cc 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -5119,11 +5119,16 @@ gtk_file_chooser_default_should_respond (GtkFileChooserEmbed *chooser_embed) selection_check (impl, &num_selected, &all_files, &all_folders); - if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER - || impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER) + if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER) { - if (num_selected > 0) - return TRUE; + if (num_selected != 1) + return TRUE; /* zero means current folder; more than one means use the whole selection */ + else if (current_focus != impl->browse_files_tree_view) + { + /* a single folder is selected and a button was clicked */ + switch_to_selected_folder (impl); + return TRUE; + } } if (num_selected == 0) -- 2.30.2